auto merge of #655 : ebfe/cargo/deps, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 2 Oct 2014 19:00:24 +0000 (19:00 +0000)
committerbors <bors@rust-lang.org>
Thu, 2 Oct 2014 19:00:24 +0000 (19:00 +0000)
At least rust-encoding needs updating to compile with rust master.


Trivial merge